fb78123db2c65f86853676c56a57a340b02d67de,src/core/org/apache/jmeter/reporters/ResultCollector.java,ResultCollector,testEnded,#String#,264

Before Change


            instanceCount--;
            if (instanceCount <= 0) {
                // No need for the hook now
                Runtime.getRuntime().removeShutdownHook(shutdownHook);
                finalizeFileOutput();
                inTest = false;
            }

After Change


            if (instanceCount <= 0) {
                // No need for the hook now
                // Bug 57088 - prevent (im?)possible NPE
                if (shutdownHook != null) {
                    Runtime.getRuntime().removeShutdownHook(shutdownHook);
                } else {
                    log.warn("Should not happen: shutdownHook==null, instanceCount=" + instanceCount);
                }